From 866193f6afe48af258b48a4e384996cdf0a25781 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 29 Jan 2016 12:20:31 -0500
Subject: [PATCH] reftests: get icon-vfuncs test almost working again

The remaining difference here is GtkArrow, which is deprecated
and has not been updated to the latest CSS rendering standards.
---
 testsuite/reftests/icon-vfuncs.css    | 8 ++------
 testsuite/reftests/icon-vfuncs.ref.ui | 2 +-
 testsuite/reftests/icon-vfuncs.ui     | 8 ++++++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/testsuite/reftests/icon-vfuncs.css b/testsuite/reftests/icon-vfuncs.css
index 00ce4ed01b..ceee34ed31 100644
--- a/testsuite/reftests/icon-vfuncs.css
+++ b/testsuite/reftests/icon-vfuncs.css
@@ -2,12 +2,8 @@
 
 * {
   -gtk-icon-source: url("green-20x20.png");
-  -GtkCheckButton-indicator-size: 16;
-  -GtkCheckButton-indicator-spacing: 0;
-  -GtkArrow-arrow-scaling: 1.0;
-  /*666666666666666666667;*/
-  -GtkExpander-expander-spacing: 0;
-  -GtkExpander-expander-size: 16;
+  min-width: 16px;
+  min-height: 16px;
   font-size: 20px;
 }
 
diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui
index ccb08c6a97..eb9e712f32 100644
--- a/testsuite/reftests/icon-vfuncs.ref.ui
+++ b/testsuite/reftests/icon-vfuncs.ref.ui
@@ -124,7 +124,7 @@
             <property name="width_request">16</property>
             <property name="height_request">16</property>
             <property name="halign">center</property>
-            <property name="valign">start</property>
+            <property name="valign">center</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
           </object>
diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui
index 52d71bfc46..31a55fa400 100644
--- a/testsuite/reftests/icon-vfuncs.ui
+++ b/testsuite/reftests/icon-vfuncs.ui
@@ -23,6 +23,8 @@
           <object class="GtkSpinner" id="spinner1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -80,6 +82,8 @@
             <property name="receives_default">False</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -94,6 +98,8 @@
             <property name="xalign">0</property>
             <property name="active">True</property>
             <property name="draw_indicator">True</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -118,6 +124,8 @@
           <object class="GtkExpander" id="expander1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
             <child>
               <placeholder/>
             </child>
-- 
2.30.2